Fix: RelationshipJoiner raw & sub-query orders
#15261
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The code looks great, but would you mind writing some tests for this? It's getting to a point where the conditions are quite complex and I would hate for them to break in the future. |
|
Yes, sure! Will do later this week. |
|
@danharrin I just added tests for the |
|
Thanks Ralph! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes two situations in the
RelationshipJoinerthat did not work:->orderByRaw("CASE WHEN role = 'PIC' THEN 1 ELSE 2 END")->orderBy(fn (Builder $query) => $query->selectRaw("CASE WHEN role = 'PIC' THEN 1 ELSE 2 END"))This PR fixes both cases to make the
RelationshipJoinerhandle them correctly. There might always be edge cases regarding this part of theRelationshipJoiner, like when the raw order by contains a binding, but at least this makes the joiner handle a few more common cases.